index 4916be3b6..78e2657dd 100644
--- a/cameraserver/CMakeLists.txt
+++ b/cameraserver/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(cameraserver PUBLIC
                 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
                             $<INSTALL_INTERFACE:${include_dest}/cameraserver>)
 wpilib_target_warnings(cameraserver)
-target_link_libraries(cameraserver PUBLIC ntcore cscore wpiutil ${OpenCV_LIBS})
+target_link_libraries(cameraserver PUBLIC ntcore cscore wpiutil opencv::opencv)

 set_property(TARGET cameraserver PROPERTY FOLDER "libraries")

diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt
index 9ab9ca709..7309043e7 100644
--- a/cscore/CMakeLists.txt
+++ b/cscore/CMakeLists.txt
@@ -33,7 +33,7 @@ target_include_directories(cscore PUBLIC
                             $<INSTALL_INTERFACE:${include_dest}/cscore>)
 target_include_directories(cscore PRIVATE src/main/native/cpp)
 wpilib_target_warnings(cscore)
-target_link_libraries(cscore PUBLIC wpiutil ${OpenCV_LIBS})
+target_link_libraries(cscore PUBLIC wpiutil opencv::opencv)

 set_property(TARGET cscore PROPERTY FOLDER "libraries")

diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt
index 4c8dfde5f..6087f8b5c 100644
--- a/wpilibc/CMakeLists.txt
+++ b/wpilibc/CMakeLists.txt
@@ -18,7 +18,7 @@ wpilib_target_warnings(wpilibc)

 if (WITH_CSCORE)
     find_package( OpenCV )
-    target_link_libraries(wpilibc PUBLIC cameraserver cscore ${OpenCV_LIBS})
+    target_link_libraries(wpilibc PUBLIC cameraserver cscore opencv::opencv)
 else()
     target_compile_definitions(wpilibc PRIVATE DYNAMIC_CAMERA_SERVER)
     # Add just the camera server include directory
